modules: fix gtk-2.0 paths to gtk-3.0
authorRoddy Shuler <roddy@endlessm.com>
Fri, 22 Jun 2018 12:53:43 +0000 (13:53 +0100)
committerMario Sanchez Prada <msanchez@gnome.org>
Fri, 22 Jun 2018 12:53:43 +0000 (13:53 +0100)
Both print backends and configuration files for multipress are being
installed in the wrong directory, so let's fix that.

modules/input/Makefile.am
modules/printbackends/papi/Makefile.am

index 34c5f385079ab37246764cc63c2118051b89daf7..bf6c1a11bd6bf677a5e3ad4d78250017cfe761bf 100644 (file)
@@ -191,7 +191,7 @@ WAYLAND_MODULE = im-wayland.la
 endif
 endif
 
-multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
+multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-3.0"\"
 im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs)
 libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
 im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
index 7176eba2ddf5cd2bb1fb32c1ce7f3dda81103aa6..1390784b8f2de8216a63bac026f9eef99a7b90b7 100644 (file)
@@ -14,7 +14,7 @@ LDADDS = \
        $(top_builddir)/gtk/libgtk-3.la \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-papi.la